projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c81cf54 97a4424)
bitkeeper revision 1.1159.185.1 (41a2270734COZXi8QOV4quF847fEWg)
authorakw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk>
Mon, 22 Nov 2004 17:51:03 +0000 (17:51 +0000)
committerakw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk>
Mon, 22 Nov 2004 17:51:03 +0000 (17:51 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/nos1/akw27/xeno-clone/xeno.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
linux-2.6.9-xen-sparse/arch/xen/Kconfig patch | diff1 | diff2 | blob | history
linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig patch | diff1 | diff2 | blob | history
linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
Unnamed repository; edit this file 'description' to name the repository.